From 3656c21030eb26c2556dcaaf972903575c9de0ae Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 3 Nov 2014 13:19:40 +0100 Subject: [PATCH] GtkGLArea: Don't dispose gl context on unrealize This was done to ensure the context is not current, but this is pretty broken for shared contexts. We now just make it non-current. --- gtk/gtkglarea.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c index a0392b9dce..d0882b7e36 100644 --- a/gtk/gtkglarea.c +++ b/gtk/gtkglarea.c @@ -524,7 +524,8 @@ gtk_gl_area_unrealize (GtkWidget *widget) } /* Make sure to destroy if current */ - g_object_run_dispose (G_OBJECT (priv->context)); + if (priv->context == gdk_gl_context_get_current ()) + gdk_gl_context_clear_current (); g_object_unref (priv->context); priv->context = NULL; } -- 2.30.2